use containers for xml_init lists. (#1345)

diff --git a/gtrnctr.cc b/gtrnctr.cc
index 5a306a79f61f9c823dc8024a61195f7934774998..8442a1f96e8f3cb1b609cf9ef630b3bc31cf9bf7 100644 (file)
--- a/gtrnctr.cc
+++ b/gtrnctr.cc
@@ -43,11 +43,20 @@
 
 #define MYNAME "gtc"
 
+const QStringList GtrnctrFormat::gtc_tags_to_ignore = {
+  "TrainingCenterDatabase",
+  "CourseFolder",
+  "Running",
+  "Biking",
+  "Other",
+  "Multisport"
+};
+
 void
 GtrnctrFormat::rd_init(const QString& fname)
 {
   xml_reader = new XmlGenericReader;
-  xml_reader->xml_init(fname, this, gtc_map, nullptr, gtc_tags_to_ignore, nullptr);
+  xml_reader->xml_init(fname, this, gtc_map, nullptr, gtc_tags_to_ignore);
 }
 
 void

diff --git a/gtrnctr.h b/gtrnctr.h
index 654b0d9951238668d09735d22bd4a15b78181657..1b5b7833fa5987b8f8a3cbc6eaf7005ef6f36c21 100644 (file)
--- a/gtrnctr.h
+++ b/gtrnctr.h
@@ -28,6 +28,7 @@
 
 #include <QList>                 // for QList
 #include <QString>               // for QString
+#include <QStringList>           // for QStringList
 #include <QVector>               // for QVector
 #include <QXmlStreamAttributes>  // for QXmlStreamAttributes
 
@@ -73,16 +74,6 @@ private:
   static constexpr int kGtcMaxNameLen = 15;
   static constexpr const char* gtc_sportlist[] = { "Biking", "Running", "MultiSport", "Other" };
 
-  static constexpr const char* gtc_tags_to_ignore[] = {
-    "TrainingCenterDatabase",
-    "CourseFolder",
-    "Running",
-    "Biking",
-    "Other",
-    "Multisport",
-    nullptr,
-  };
-
   /* Member Functions */
 
   [[gnu::format(printf, 3, 4)]] void gtc_write_xml(int indent, const char* fmt, ...);
@@ -124,6 +115,7 @@ private:
 
   /* Data Members */
 
+  static const QStringList gtc_tags_to_ignore;
   gbfile* ofd{};
   int lap_ct = 0;
   int lap_s = 0;

diff --git a/kml.cc b/kml.cc
index 7cd37e57fde0910d177b56a5f868e396abbde4fe..684fb481dc9329b20c5bcbb41a4bd336fc3a7174 100644 (file)
--- a/kml.cc
+++ b/kml.cc
@@ -71,6 +71,19 @@
 
 #define MYNAME "kml"
 
+const QStringList KmlFormat::kml_tags_to_ignore = {
+  "kml",
+  "Document",
+  "Folder"
+};
+
+const QStringList KmlFormat::kml_tags_to_skip = {
+  "Camera",
+  "LookAt",
+  "styleUrl",
+  "snippet"
+};
+
 const QVector<KmlFormat::mt_field_t> KmlFormat::mt_fields_def = {
   { wp_field::igc_enl, "igc_enl", "Engine Noise", "double" },
   { wp_field::igc_tas, "igc_tas", "True Airspd", "double" },

diff --git a/kml.h b/kml.h
index 4ed4d400818126b60eb5a8a46ac46c073b2cde24..e225ece41995ac7958ce59dba83d5224d2dcbe4b 100644 (file)
--- a/kml.h
+++ b/kml.h
@@ -22,22 +22,23 @@
 #ifndef KML_H_INCLUDED_
 #define KML_H_INCLUDED_
 
-#include <bitset>                       // for bitset
-#include <tuple>                        // for tuple, make_tuple, tie
+#include <bitset>                      // for bitset
+#include <tuple>                       // for tuple, make_tuple, tie
 
-#include <QHash>                        // for QHash
-#include <QList>                        // for QList
-#include <QString>                      // for QString, QStringLiteral, operator+, operator!=
-#include <QVector>                      // for QVector
-#include <QXmlStreamAttributes>         // for QXmlStreamAttributes
+#include <QHash>                       // for QHash
+#include <QList>                       // for QList
+#include <QString>                     // for QString, QStringLiteral, operator+, operator!=
+#include <QStringList>                 // for QStringList
+#include <QVector>                     // for QVector
+#include <QXmlStreamAttributes>        // for QXmlStreamAttributes
 
 #include "defs.h"
 #include "format.h"
-#include "src/core/datetime.h"          // for DateTime
-#include "src/core/file.h"              // for File
-#include "src/core/xmlstreamwriter.h"   // for XmlStreamWriter
-#include "units.h"                      // for UnitsFormatter
-#include "xmlgeneric.h"                 // for cb_cdata, cb_end, cb_start, xg_callback, xg_cb_type, xml_deinit, xml_ignore_tags, xml_init, xml_read, xg_tag_mapping
+#include "src/core/datetime.h"         // for DateTime
+#include "src/core/file.h"             // for File
+#include "src/core/xmlstreamwriter.h"  // for XmlStreamWriter
+#include "units.h"                     // for UnitsFormatter
+#include "xmlgeneric.h"                // for cb_cdata, cb_end, cb_start, xg_callback, xg_cb_type, xml_deinit, xml_ignore_tags, xml_init, xml_read, xg_tag_mapping
 
 
 class KmlFormat : public Format
@@ -115,21 +116,6 @@ private:
   static constexpr const char* default_precision = "6";
   static constexpr int kml_color_limit = 204;  /* allowed range [0,255] */
 
-  static constexpr const char* kml_tags_to_ignore[] = {
-    "kml",
-    "Document",
-    "Folder",
-    nullptr
-  };
-
-  static constexpr const char* kml_tags_to_skip[] = {
-    "Camera",
-    "LookAt",
-    "styleUrl",
-    "snippet",
-    nullptr
-  };
-
   /* Member Functions */
 
   void kml_init_color_sequencer(int steps_per_rev);
@@ -200,6 +186,8 @@ private:
 
   /* Data Members */
 
+  static const QStringList kml_tags_to_ignore;
+  static const QStringList kml_tags_to_skip;
   static const QVector<mt_field_t> mt_fields_def;
   track_trait_t kml_track_traits;
   QHash<const route_head*, track_trait_t> kml_track_traits_hash;

diff --git a/xmlgeneric.cc b/xmlgeneric.cc
index 1aae5b6e7ac0cd44822857392feac012fbb072d3..792bd0574a90d0db41e170ddc3132269b3b572c5 100644 (file)
--- a/xmlgeneric.cc
+++ b/xmlgeneric.cc
@@ -21,6 +21,7 @@
 
 #include "xmlgeneric.h"
 
+#include <algorithm>             // for for_each
 #include <utility>               // for as_const
 
 #include <QByteArray>            // for QByteArray
@@ -66,7 +67,7 @@ XmlGenericReader::xml_tbl_lookup(const QString& tag, xg_cb_type cb_type)
 
 void
 XmlGenericReader::xml_common_init(const QString& fname, const char* encoding,
-         const char* const* ignorelist, const char* const* skiplist)
+         const QStringList ignorelist, const QStringList skiplist)
 {
   rd_fname = fname;
 
@@ -80,16 +81,13 @@ XmlGenericReader::xml_common_init(const QString& fname, const char* encoding,
   }
 
   xg_shortcut_taglist.clear();
-  if (ignorelist != nullptr) {
-    for (; ignorelist && *ignorelist; ++ignorelist) {
-      xg_shortcut_taglist.insert(QString::fromUtf8(*ignorelist), xg_shortcut::sc_ignore);
-    }
-  }
-  if (skiplist != nullptr) {
-    for (; skiplist && *skiplist; ++skiplist) {
-      xg_shortcut_taglist.insert(QString::fromUtf8(*skiplist), xg_shortcut::sc_skip);
-    }
-  }
+  std::for_each(ignorelist.cbegin(), ignorelist.cend(), [this](const QString& tag)->void {
+    xg_shortcut_taglist.insert(tag, xg_shortcut::sc_ignore);
+  });
+    
+  std::for_each(skiplist.cbegin(), skiplist.cend(), [this](const QString& tag)->void {
+    xg_shortcut_taglist.insert(tag, xg_shortcut::sc_skip);
+  });
 }
 
 XmlGenericReader::xg_shortcut

diff --git a/xmlgeneric.h b/xmlgeneric.h
index aec623b84206672a28f3322bc3a52dd66f8cadb7..dd1bb86a563f057615d7dc62978591e228144452 100644 (file)
--- a/xmlgeneric.h
+++ b/xmlgeneric.h
@@ -30,6 +30,7 @@
 #include <QList>                 // for QList
 #include <QRegularExpression>    // for QRegularExpression
 #include <QString>               // for QString
+#include <QStringList>           // for QStringList
 #include <QStringView>           // for QStringView
 #include <QTextCodec>            // for QTextCodec
 #include <QXmlStreamAttributes>  // for QXmlStreamAttributes
@@ -88,8 +89,8 @@ public:
   template<class MyFormat>
   void xml_init(const QString& fname, MyFormat* instance, const QList<xg_fmt_map_entry<MyFormat>>& tbl,
                 const char* encoding = nullptr,
-                const char* const* ignorelist = nullptr,
-                const char* const* skiplist = nullptr)
+                const QStringList ignorelist = QStringList(),
+                const QStringList skiplist = QStringList())
   {
     build_xg_tag_map(instance, tbl);
 
@@ -164,7 +165,7 @@ private:
 
   XgCallbackBase* xml_tbl_lookup(const QString& tag, xg_cb_type cb_type);
   void xml_common_init(const QString& fname, const char* encoding,
-                       const char* const* ignorelist, const char* const* skiplist);
+                       const QStringList ignorelist, const QStringList skiplist);
   xg_shortcut xml_shortcut(QStringView name);
   void xml_run_parser(QXmlStreamReader& reader);